From: Andreas Schwab <schwab@suse.de>
Date: Thu, 18 Jul 2002 09:42:56 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~31539
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6c673e507c2d62dffc6aebb4a3dc21d114d29746;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 109f1d7ebc3..049322e0ba2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -83,7 +83,6 @@
 	* international/utf-8-subst.el: Populate utf-8-subst-rev-table.
 	(utf-8-subst-table): Don't set.
 
->>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule.el (define-coding-system-alias):